Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 31 Dec 2011 18:36:58 +0000 (10:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 31 Dec 2011 18:36:58 +0000 (10:36 -0800)

Trivial merge